Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 18:52:37 +0000 (10:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 18:52:37 +0000 (10:52 -0800)

Trivial merge